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

Change-Id: I66218523b4542df6198e8f2ae3e40487f1906597