Merge "Revert "Avoid wm<->am deadlock when checking uri permission"" into rvc-dev