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