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

Change-Id: I75f379a7a5481fa143285bdb3e8223907b4378c4