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



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