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