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