Merge "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" into nougat-mr1-cts-dev
am: e090519020  -s ours

Change-Id: I5468b2f1bc309d641eda3a824fd483a039df3273