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