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

Change-Id: I6ee4f631e08cea1cace96d2ed16c7d671b66bdf0