Merge "[RESTRICT AUTOMERGE]: Revert "STS test for Android Security CVE-2019-2054"" into nyc-dev