Merge "[automerger skipped] Merge "DO NOT MERGE: Bump CTS and CTS Verifier to 7.1_r20" into nougat-mr1-cts-dev am: f9ef46c043  -s ours" into oreo-cts-dev
am: e6cd832b2a  -s ours

Change-Id: I69cc66190648cc3209eda8315fa0053576ef4a00