Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2814219 Change-Id: Ia91ee62afa4a8c45128f17aa49f9af3222ad415d Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>