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