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