[automerger skipped] Merge "DO NOT MERGE: Bump CTS and CTS Verifier version to 8.1_r22" into oreo-mr1-cts-dev am: 590832a562 -s ours am: e5dc73d5e8 -s ours am: f5db1f7032 -s ours

am skip reason: subject contains skip directive

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

Change-Id: I302801b1f772d723a4869142ab7002cbb464fa5f