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

Change-Id: Idb3567f6db884a03d05bd4135e4dc53e44e325e4