[automerger skipped] Merge "DO NOT MERGE: Bump CTS and CTS Verifier to 8.0_r25" into oreo-cts-dev am: 7abe3e0d31 -s ours

am skip reason: subject contains skip directive

Original change: https://android-review.googlesource.com/c/platform/cts/+/1359765

Change-Id: I491c8371e710cbd3453c0b50ff6ab1aba9d5f45f