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