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