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

Change-Id: I9eee5a26aaf5a335f633c1b68656da72eddd0c3b