[automerger skipped] Merge "DO NOT MERGE: Bump CTS and CTS Verifier version to 8.1_r21" into oreo-mr1-cts-dev am: 07ffc01892 -s ours

am skip reason: subject contains skip directive

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

Change-Id: I93486ed9d74ad066a6d4ada5c8df149293bea157