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