Merge "Removing a mimeIcon specific for album folders from MediaProvider." into nyc-mr1-dev
am: c8358bfe65

Change-Id: Ic4ba062d30bacfc4ee7ab1ff77e44caab30c6eb4