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