Merge "DO NOT MERGE: Bump CTS and CTS Verifier to 6.0_r15 am: 1100322fee  -s ours" into nougat-cts-dev am: ff7ca12946  -s ours am: 6c2f52d8f2  -s ours am: a5d7aaf421
am: 7b16501aa3

Change-Id: Iadeeeb3f9b0f811b6290c05d0467d777b32977bb