[automerger] Revert "[RESTRICT AUTOMERGE]: STS test fix for Android Security CVE-2017-0727" am: d0d04284 am: 5a213814 Change-Id: If9849f1448e752e5f9f3db68481ae5dc1f5bcab9