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