[automerger skipped] Merge changes from topic "presubmit-am-25573e946ece4fa1804202119abb6474-sc-dev" into sc-mainline-prod am: 58a9eef654 -s ours am: 601caaa4bb -s ours

am skip reason: Merged-In Ib1701358f9058aeaaa336be8d074cfaa700c4309 with SHA-1 9a2a8e5205 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/19784418

Change-Id: I335d2039d8462229f828f7af17bfd120dd75ef9b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>