Merge "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" into oreo-cts-dev am: d931fafeb4  -s ours am: 6a32006610
am: f9c41bfb47

Change-Id: I96868c4fcef2dbcf51532d60f740bfe244d5aac2