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