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