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
am: 6c5117bbf7  -s ours

Change-Id: I090a0fe31f18ebabd291a9398aa9ae1b47c26037