Merge "Merge "Fix uri permission grant on remote bug report uri" into nyc-dev am: 42f2e80293 am: 824c8284ce am: 72074e3ab9 am: f85a20702a am: 0f2c853889" into nyc-mr2-dev-plus-aosp
am: 90629b8789  -s ours

Change-Id: I7567f5cb08144ad8331e0114a64ba701ceb7cca7