Merge "DO NOT MERGE: Bump CTS and CTS Verifier to 6.0_r20" into marshmallow-cts-dev
am: 34c68a07e2  -s ours

Change-Id: Id6c9f75a01644c53da35ae4b675cd0a4821790d0