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