Merge "DO NOT MERGE: Bump CTS and CTS Verifier to 6.0_r22" into marshmallow-cts-dev am: 6a48394c66  -s ours am: 003bcd2902
am: 2fb33e9305

Change-Id: I67d1422d45e14a010f4eb6ef485db91aaac8d03b