Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2833750



Change-Id: I979388a1b9c3ef13a891b2e29690bbb18a1b3fb3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>