Merge "STS test for Android Security CVE-2021-0705" into sc-dev