Merge "[automerger skipped] Merge "DO NOT MERGE: Bump CTS and CTS Verifier to 7.0_r31" into nougat-cts-dev am: aab6efba -s ours am: 5b01f188 -s ours am skip reason: subject contains skip directive Change-Id: Ifd6479832f55af7bc5cd6098b820d16ea511a97a