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