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