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