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