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

Change-Id: I9f2a633effe07ce521d3c896a6eed6fad66f2750