Merge "Merge "DO NOT MERGE: Bump CTS and CTS Verifier to 7.0_r7" into nougat-cts-dev am: 9e11570455  -s ours" into nougat-mr1-cts-dev