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