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