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