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

Change-Id: I3f94f7788e3deaff54c2504144daa52eabb0d36f