[automerger skipped] Merge changes from topic "connectivity-cts-cherrypicks" into sc-dev am: 77fb999ed0 am: 2f329557bd -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: I5d273cabb28391d5a05844ce2cdd720c53f5b24c
This commit is contained in: