Merge "[RESTRICT AUTOMERGE]: CTS test for Android Security CVE-2016-3835" into nyc-dev