Merge "STS test for Android Security CVE-2021-0314" into pi-dev