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