Merge "Merge "DO NOT MERGE: Bump CTS and CTS Verifier to 7.0_r20" into nougat-cts-dev am: 11fa40fd48  -s ours" into nougat-mr1-cts-dev
am: 75b4451fe8  -s ours

Change-Id: I0879516bf238ff8d70b354ccf7b21c03dd70c76a