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