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
am: 77a236c347

Change-Id: Ia611f90f9f23daa23156d66126e7265eaa3b4d0f