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

Change-Id: Iaaa1ffa0ae322a0fc5ceaf9b8ab3f81bd746df86