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

Change-Id: Ie05827ef3f4fe3a429d2b9bd985acdd1f83cab87