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

Change-Id: I50f598193d0fcb2926b4b484fb017834a2a97875