[automerger] [RESTRICT AUTOMERGE]: Revert "Revert "[RESTRICT AUTOMERGE]: STS test fix for Android Security CVE-2017-0727"" am: 745f2a97 am: e90facab am: ba9fac71 Change-Id: I94c33bcda5b89f01cbab77fad30545981a9abb37