[automerger skipped] Merge "DO NOT MERGE: Bump CTS and CTS Verifier to 6.0_r31" into marshmallow-cts-dev am: d333a47e -s ours skipped: 889cf929 Change-Id: I1b3d19eab52671c88326b6cb6f49540950e39b33