Merge "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" into nougat-mr1-cts-dev am: 16ab69900f  -s ours am: 527607b603 am: 3e1a79b04f am: ed98bbb63f
am: 38d1cd1e06  -s ours

Change-Id: If28f244fb11e1ed2a5044257cb234d1568980296