Merge "RESTRICT AUTOMERGE: CTS test for Android Security CVE-2017-17767" into nyc-dev