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