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