Merge "Uri permission grants improvements, tests, fixes." into rvc-dev am: 64bd9c7b am: 84a80e52 Change-Id: I489df55a41d1b73a64b688e3cf4929936c41c77a