Merge "CTS test for Android Security CVE-2017-0696" into nyc-dev