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

Change-Id: I6c1f554c397ed5989f567107bffa71b89f63af76