Merge "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 am: b3bb0247de am: 95887a6206  -s ours am: 065adab71f am: e219c3e317" into nyc-mr1-dev am: baf182360f am: 43ba4258bf am: 903d752fb4
am: 7d1a4afb4f  -s ours

Change-Id: If60521742c97fe2e4fc8d16be30eeb31152ebb61