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