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