Merge "[automerger skipped] Merge "DO NOT MERGE: Bump CTS and CTS Verifier to 7.1_r22" into nougat-mr1-cts-dev am: 19ee72d77c  -s ours" into oreo-cts-dev
am: 2487908cb7  -s ours

Change-Id: Ief87df0efc062191c064b788cb3ff3e2fc08f286