Merge "[automerger skipped] Merge "DO NOT MERGE: Bump CTS and CTS Verifier to 6.0_r31" into marshmallow-cts-dev am: d333a47e1f  -s ours" into nougat-cts-dev
am: 5f2cdbfbb1  -s ours

Change-Id: I9597ceaeee63a27f6367d705a0506894004c9f50