Merge "Merge "[automerger skipped] Merge "DO NOT MERGE: Bump CTS and CTS Verifier to 7.0_r24" into nougat-cts-dev am: 9b51467d9b  -s ours" into nougat-mr1-cts-dev am: 006fb42828  -s ours" into oreo-cts-dev
am: 560750ede5  -s ours

Change-Id: I6d63f8acdabb12fd33e2ad3e270ede65dfcc2263