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