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