Merge "Merge "Merge "[automerger skipped] Merge "DO NOT MERGE: Bump CTS and...

Merge "Merge "Merge "[automerger skipped] Merge "DO NOT MERGE: Bump CTS and CTS Verifier to 7.0_r28" into nougat-cts-dev am: 6244df07  -s ours" into nougat-mr1-cts-dev am: 606fdd1c  -s ours" into oreo-cts-dev am: 90066b0a  -s ours" into oreo-mr1-cts-dev
am: 1cc9411e  -s ours

Change-Id: I307df0392c62e434b56d1554e40c5351eed32d3c