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