Merge "Avoid wm<->am deadlock when checking uri permission" into rvc-dev am: 02c67b119e am: 023e809098 am: a7408a62e9
Change-Id: I8452982cb724ae2bf587b165fc95dbbeca04a583
This commit is contained in: