Merge "Merge "[automerger skipped] Merge "DO NOT MERGE: Bump CTS and CTS Verifier to 8.0_r20" into oreo-cts-dev am: 01bed4b8a3 -s ours am: 4a82a25ae6 -s ours am skip reason: subject contains skip directive" into pie-cts-dev