Merge "[automerger skipped] Merge "DO NOT MERGE: Bump CTS and CTS Verifier to 7.0_r22" into nougat-cts-dev am: 722af5da9e  -s ours" into nougat-mr1-cts-dev
am: a7055a959b  -s ours

Change-Id: I295db9cb183cac794f9f4e69fb2dc08ebaf4ab12