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