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

Change-Id: Ie768349ab4ad5c67f471642151f5f66101e4ebea