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

Change-Id: I0bc710a1feb3165cf473006a0fe0ef044f04d245