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