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