Merge "Merge "DO NOT MERGE: Bump CTS and CTS Verifier to 6.0_r24" into marshmallow-cts-dev am: ab95db936d  -s ours" into nougat-cts-dev
am: 0e4b4803e9  -s ours

Change-Id: Iaf291c2627bc4490dbd4b0af0917bde0978d8c05