Merge "Merge "DO NOT MERGE: Bump CTS and CTS Verifier to 8.0_r7" into oreo-cts-dev am: 48bef7f6bf  -s ours" into oreo-mr1-cts-dev