Merge "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: ae698afa57 -s ours
am skip reason: subject contains skip directive

Change-Id: I220d7eea4bf4143504a124d7f7e010b60bb9878c