[automerger skipped] Merge "DO NOT MERGE: Bump CTS and CTS Verifier to 7.0_r31" into nougat-cts-dev am: aab6efba94 -s ours am skip reason: subject contains skip directive skipped: 6de5b74e92 skipped: e657488e1f skipped: 9e7fcfada1 skipped: fc98adc06e skipped: 9a26da5786

Change-Id: I725f84611eecf5953a4f2d51895ca2eaa1cd6be7