Merge "Revert "STS test fix for Android Security CVE-2019-2025"" into oc-mr1-dev