[automerger skipped] Merge changes from topic "presubmit-am-fe556d6c0b514f0cb414a758f74fc0c4" into sc-v2-dev-plus-aosp am: e86fb57b1a -s ours

am skip reason: Merged-In I58462f6d0303803ffd43333b67865c57edef39a3 with SHA-1 4c06947fce is already in history

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

Change-Id: I6b08b18a4bc98a9b5e39e1e03019823d42743dc7