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