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