[automerger skipped] Merge "Merge history of CTS" into stage-aosp-master am: 667aeac161 -s ours am: bfec25dc1f -s ours
am skip reason: Change-Id I30d52c4df571c894b7797300e8f56ddd4b2cc2dd with SHA-1 35cd54f7a0 is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/12984379
Change-Id: Ia41b3bdb9ddb1e7c407f7a8fa0a9512ff52cd41e
This commit is contained in: