Merge "DO NOT MERGE: Bump CTS and CTS Verifier to 7.0_r20" into nougat-cts-dev
am: 11fa40fd48  -s ours

Change-Id: I8b64edc639b635db1e9abd3148a20eb896d77150