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