Merge "[automerger skipped] Merge "DO NOT MERGE: Bump CTS and CTS Verifier to 8.1_r16" into oreo-mr1-cts-dev am: 3e8aa0e615 -s ours am skip reason: subject contains skip directive" into pie-cts-dev