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