Merge "Merge "Avoid wm<->am deadlock when checking uri permission" into rvc-dev am: 02c67b119e am: f981ae6023" into rvc-d1-dev-plus-aosp am: bfb678aa6c am: dc02153759
Change-Id: Ifa920a64a781445a310e4e3a6927ca8b93ae9843
This commit is contained in: