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