[automerger skipped] Merge changes from topic "connectivity-cts-cherrypicks" into sc-dev am: 77fb999ed0 -s ours

am skip reason: Merged-In I55371fabe0d2fa32a71520af11f18f1eeea31460 with SHA-1 56bc7d4dde is already in history

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

Change-Id: Ic82ea657b7d22c4452e225b5c292dedf28ef1638