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

Change-Id: I3861a5229fdb55f7dc7fd57e1706b34f9847d492