Merge "Merge "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 am: f3dfa6b3b8  -s ours" into oreo-cts-dev am: 7998d64256  -s ours" into oc-dev
am: 4d7cf22d15

Change-Id: I70660cd75bf46db4ce5e173874f1e23a31b340d9