Merge "Revert "Revert "CTS test for Android Security b/63522067""" into nyc-dev