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 Change-Id: I0b29f87efabcf89fba21f7b5e1ec4e150c3c553f