[automerger skipped] Merge "DO NOT MERGE: Bump CTS and CTS Verifier to 7.1_r23" into nougat-mr1-cts-dev am: c9917775 -s ours skipped: 81d88eb2 skipped: 20bd0928 skipped: a312e53e Change-Id: I8da26519c387df4060e5e0e8bc7b40a0a7124ef4