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: b484f95e92 -s ours am: 1ed449ffd8 -s ours am: 484fc6a81d -s ours

am skip reason: subject contains skip directive

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

Change-Id: I93809f4eba437ac2d124fe08e29f85859947d3ac