Merge "Merge "STS test for Android Security CVE-2019-2003" into rvc-dev am: 9878806d9f am: 241c441390 am: 3ed1ce3f7c" into sc-dev