[automerger] [RESTRICT AUTOMERGE]: STS test fix for Android Security CVE-2017-6279 am: cc66f9a6b5 am: 8af14640f8

Change-Id: I63d59837ab40b1c0d2a6f78740a22f682bfe063f