[automerger] [RESTRICT AUTOMERGE]: STS test fix for Android Security CVE-2017-6279 am: cc66f9a6 am: 8af14640 am: a310359d Change-Id: Iba30f3bd94d51b98026cbbc87c0e9db39b25cd6c