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

Change-Id: I519736625a456b7c03fac70234771760f954c460