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