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
am: 623b2d6481

Change-Id: I7ec7535d765cd72216e03b1e336c1d92b0ebad66