Merge "STS test for Android Security CVE-2018-9471 am: 5838d35e14 am: 4c0fd15e89 am: 695ab05956" into qt-qpr1-dev-plus-aosp