Merge "Merge "DO NOT MERGE: Bump CTS and CTS Verifier to 7.1_r11" into nougat-mr1-cts-dev am: e988c964a6  -s ours" into oreo-cts-dev
am: 94861997e9  -s ours

Change-Id: I4950da99e5f6e068f62dcc24a853f0ffea6f4827