Merge "Merge "DO NOT MERGE: Bump CTS and CTS Verifier to 6.0_r18" into marshmallow-cts-dev am: f649c6f3a4  -s ours" into nougat-cts-dev
am: 6965878431  -s ours

Change-Id: I7202605bd3d3f6d9a90e6fce6c30732afa45eb5e