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