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