Merge "Revert "[RESTRICT AUTOMERGE]: STS test for Android Security CVE-2018-9471"" into oc-dev am: d61d5021ce am: 0647328e50

Change-Id: If9a1b986ee633632cf799d86f6c91363d28811c5