Merge "CTS test for Android Security CVE-2018-9344" into pi-dev