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