Merge "Merge "[automerger skipped] Merge "DO NOT MERGE: Bump CTS and CTS Verifier to 8.0_r18" into oreo-cts-dev am: aa7e0129 -s ours am: d5439152 -s ours am skip reason: subject contains skip directive" into pie-cts-dev