[automerger skipped] Merge "DO NOT MERGE: Bump CTS and CTS Verifier to 6.0_r30" into marshmallow-cts-dev am: e7d20373d1  -s ours skipped: d284d16382 skipped: 666882945b

Change-Id: Ia4c0e0a1df2219e82ab215c76d54ab8fadd5976a