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

Change-Id: Icfdd2a6027c75e43c78f85109341ae088102548b