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