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