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