Merge "[automerger skipped] Merge "DO NOT MERGE: Bump CTS and CTS Verifier to 7.1_r24" into nougat-mr1-cts-dev am: 5362555f -s ours" into oreo-cts-dev am: 7228da71 -s ours Change-Id: I58f750fda77344fb71512f82040d217b3f8d4a80