[automerger skipped] [RESTRICT AUTOMERGE]: Fix STS test for CVE-2017-0817 am: 6c00bffb48 -s ours am: 63d6d7e3c2 am: b4f1003f40 -s ours am: 4057ef1989 am: 39cc9c2af0

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

Change-Id: I62ef896dc248ab5c03e21e5eca545fe9ebc89fd0