[automerger skipped] Merge "Merge history of CTS" into stage-aosp-master am: 667aeac161 -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: I2070e10640ccdb27fe5dbcafa030fe3c5015ade4
This commit is contained in: