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