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