Merge "Merge "DO NOT MERGE: Bump CTS and CTS Verifier to 7.1_r15" into nougat-mr1-cts-dev am: 485c16b4d3  -s ours" into oreo-cts-dev
am: 94926ffc25  -s ours

Change-Id: Iaeb4a79b9e58b31d2083be84d6165d7e33da47e3