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