Merge "Merge "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" into oreo-cts-dev am: 55143364fc  -s ours" into oc-dev am: 0c29e60748 am: 78f4674692
am: b9764176ab

Change-Id: Ie2a1e1cf4e9621e6224b3a0fa062fba4d08d23c0