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

Change-Id: I5ba1f7f7d83e5c6723cc60d298b7b358844687e3