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



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