[automerger skipped] [RESTRICT AUTOMERGE]: Fix STS test for 2020-0224 am: f0a91d5b75 am: ad36d25d95 -s ours

am skip reason: subject contains skip directive

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

Change-Id: I4d52710ca634d086f1580a103cdaab8087bfafef