[automerger skipped] Fix STS test for 2020-0224 am: ef7dc6cca8 am: 3cd843613c am: 8598d02219 am: c9b02542c1 -s ours am: a0143f7424 -s ours am: 75ba2fe154 -s ours am: 71ab3aebdb -s ours am: d45a861cbc -s ours am: 203805c46d -s ours

am skip reason: Merged-In I257cc7cc6f72149708736b9b62659e75ce4dc1d2 with SHA-1 ef7dc6cca8 is already in history

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

Change-Id: I93938ce28b655a6b0c6a960f4c09cd2323402014