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