Merge "Merge "DO NOT MERGE: Bump CTS and CTS Verifier to 7.0_r18" into nougat-cts-dev am: 574ee81d02  -s ours" into nougat-mr1-cts-dev am: 65639e8ba8  -s ours am: 0b639e2e2f am: 993fdd9650
am: ffb0a1106d  -s ours

Change-Id: I3a4b07e16b905349c31baef83455a3eb4d8d07be