[automerger skipped] Merge changes from topic "presubmit-am-25573e946ece4fa1804202119abb6474" into sc-v2-dev-plus-aosp am: a244a834aa -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/+/16822123

Change-Id: Iafe90af485021866fd405ca06778f905692119ab