[automerger skipped] Merge "DO NOT MERGE: Bump CTS and CTS version to 8.1_r25" into oreo-mr1-cts-dev am: 5ac4887c6d -s ours am skip reason: subject contains skip directive Original change: https://android-review.googlesource.com/c/platform/cts/+/1764608 Change-Id: I63a25cf64c3af5f3068a453759edc97df167b255