[automerger skipped] Merge changes from topic "presubmit-am-25573e946ece4fa1804202119abb6474-sc-dev" into sc-qpr1-dev am: d0bb953892 am: 4805778f01 -s ours am: 95e9f31fc5 -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: I02f6df1cc8e81a8b558120bd41bd9d4b87a9ed97
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>