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