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