DO NOT MERGE : Revert "DO NOT MERGE. No direct Uri grants from system."

Reason: Breaking setting the user avatar in Settings.
Bug: 35158271
This reverts commit b61338ecb307a2f595a8f78e290b5287a6503aaa.

Change-Id: Ia08c12be3da06b0d02e71635b46350c8ff50ec19
1 file changed