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

Change-Id: Ie64bb70827e04fe83005a058276eea08348bfc91