Merge "Set MIME type when building BROWSE intents." into nyc-mr1-dev am: 4a021fa541
am: 1da71d39b1

Change-Id: I995fe7af9e79479aea35562fdc30a589ceaf9922