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