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