Merge "Fix uri permission grant on remote bug report uri" into nyc-dev am: 42f2e80293 am: 824c8284ce am: 72074e3ab9 am: f85a20702a
am: 060cde9802

Change-Id: Ic591b48e298823b46f8d1fc25b0e01a82cc263b5