[automerger skipped] Merge "[RESTRICT AUTOMERGE]: STS bp to mk for CVE-2021-0318" into oc-mr1-dev am: 016f0f1f51 -s ours

am skip reason: subject contains skip directive

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I9499fb45c24266baac8e1ca5148ac7d897f8cbdc