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