Merge "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" into nougat-mr1-cts-dev
am: 188dd9e1ad  -s ours

Change-Id: I823587e9a5360841519fabf657d9476a55f30482