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