[automerger skipped] Merge "DO NOT MERGE: Bump CTS and CTS Verifier to 7.0_r24" into nougat-cts-dev am: 9b51467d9b  -s ours skipped: 7ce2f892b6 skipped: b8442d6a57 skipped: bec29e4c37 skipped: 753433762b skipped: 0ff6bb3f94 am: e9ecf0acec am: 0ab23928cf  -s ours
am: 6260dcd5fb  -s ours

Change-Id: Iebd3732a9b028499e60013183573a2bca487e33e