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