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
am: 2874a73323

Change-Id: I5f93733474e0108ec5ddc06a42e34b19bd416d30