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