Merge "[automerger skipped] Merge "DO NOT MERGE: Bump CTS and CTS Verifier to 8.0_r21" into oreo-cts-dev am: 41f560fc59 -s ours am skip reason: subject contains skip directive" into oreo-mr1-cts-dev