Merge "[automerger skipped] Merge "DO NOT MERGE: Bump CTS and CTS Verifier to 7.1_r23" into nougat-mr1-cts-dev am: c9917775c6  -s ours" into oreo-cts-dev
am: 6430190c64  -s ours

Change-Id: Ic6bf4ab0b01fe9bbe20669df8a7560c21e0ca289