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

Change-Id: I6ae09a7758035d272c87db9a9225a01124f21822