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
Change-Id: Ic666785480a0f75e0c1ecbfdba9aa210449ba3c5
This commit is contained in: