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