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