Merge "Merge "[automerger skipped] Merge "DO NOT MERGE: Bump CTS and CTS Verifier to 7.1_r28" into nougat-mr1-cts-dev am: cf7c031fae -s ours am: a30ce4c4fe -s ours am skip reason: subject contains skip directive" into oreo-mr1-cts-dev