Merge "Merge "[automerger skipped] Merge "DO NOT MERGE: Bump CTS and CTS Verifier to 8.0_r23" into oreo-cts-dev am: a44f56aa -s ours am skip reason: subject contains skip directive" into oreo-mr1-cts-dev am: 7190845a -s ours am skip reason: subject contains skip directive" into pie-cts-dev