Merge "[automerger skipped] Merge "DO NOT MERGE: Bump CTS and CTS Verifier to 8.0_r24" into oreo-cts-dev am: 83c1979ca0 -s ours" into oreo-mr1-cts-dev