Merge "DO NOT MERGE: Bump CTS and CTS Verifier to 6.0_r15 am: 1100322fee  -s ours am: 829395c187  -s ours" into nougat-mr1-cts-dev am: e3d8fa244e  -s ours am: 5d7eb11bd7
am: afb1818f98

Change-Id: I3466bb481264476ddf83703173f3fb98278dd338