Merge "Updated CTS test to handle new DynamicAndroid permission"