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