Merge "Merge "[automerger skipped] Merge "DO NOT MERGE: Bump CTS and CTS Verifier to 7.0_r21" into nougat-cts-dev am: 6898ae42a8  -s ours" into nougat-mr1-cts-dev am: f0e63629b0  -s ours" into oreo-cts-dev am: 88805fb475  -s ours am: a3ad11c6e0 am: a35956eec9
am: e80a3e2989  -s ours

Change-Id: If9a674a3df13b012a4b9c5d2bc82e4ca06c291a2