Merge "[automerger skipped] Merge "DO NOT MERGE: Bump CTS and CTS version to 8.1_r25" into oreo-mr1-cts-dev am: 5ac4887c6d -s ours" into pie-cts-dev am: 4364f7b7d2 -s ours am: bb0a0e61e2 -s ours

am skip reason: subject contains skip directive

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

Change-Id: I5098065022e608f1681d75187e3389f0a54f4a92