Merge "Updated CTS test to handle new DynamicAndroid permission"
am: 00502e2ceb

Change-Id: I69a3865e490beadbbb7ee2f5fee94a69260559d1