[automerger skipped] Merge changes from topic "am-cc17cb7d48ea4bd7adc9183dc0c381e3-sc-dev" into sc-dev am: 0f956db686 am: f1dfc9cd6a -s ours

am skip reason: Merged-In Ib95b58dab93f7adebc445b662a6d15db1ce0e7c2 with SHA-1 0b3f20a64d is already in history

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

Change-Id: Iafcc6e7d2422916eb8905508dd4b60398985324c