[automerger skipped] Merge "Updated CTS test to handle new DynamicAndroid permission" am: 00502e2ceb am: 73d817ed4f
am: a5425f5995 -s ours
am skip reason: change_id I5b8dcdde0efcbf80420e04e67a9471045906a39d with SHA1 ddc9546b86 is in history

Change-Id: I0718e427cae90d79df86b890c7eae81b91f7a563