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