Merge "Merge "[automerger skipped] Merge "DO NOT MERGE: Bump CTS and CTS Verifier to 8.0_r22" into oreo-cts-dev am: 356f397f -s ours am: 4dd2e86b -s ours am skip reason: subject contains skip directive" into pie-cts-dev