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