Merge "[automerger skipped] Merge "DO NOT MERGE: Bump CTS and CTS Verifier to 8.1_r12" into oreo-mr1-cts-dev am: 3509c279 -s ours" into pie-cts-dev am: 19b69079 -s ours Change-Id: I1c747d14794aff7fb7bcc29c8bd109891a712065