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