Merge "[automerger skipped] Merge "DO NOT MERGE: Bump CTS and CTS Verifier to 7.1_r21" into nougat-mr1-cts-dev am: e36edd5387  -s ours" into oreo-cts-dev