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