Merge "Uri permission grants improvements, tests, fixes." into rvc-dev am: 64bd9c7be8

Change-Id: I6e8ce0e51033dd358bea918d1a42131a47f8ab45