Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2063922 Change-Id: I966e6dac28759075313774966039097ff033d686 Ignore-AOSP-First: this is an automerge Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>