[automerger skipped] Merge "Move VerifiedBootTest from STS-only to CTS-only" into pie-cts-dev am: fbda1b5422 -s ours am: c944a335fb -s ours

am skip reason: Merged-In Ib6889a3ffbc98c66b8434b2088585cdacca16f7f with SHA-1 6e1bf35bb0 is already in history

Original change: https://android-review.googlesource.com/c/platform/cts/+/1700128

Change-Id: I2333f06c5a8c058e0d0fa99a5f029f9c4f20be10