Merge "Hide eject icon of removable media when it's emulated volume"
am: 7f656092df

Change-Id: Icf28f47946aeb9f808041b90893c3543f270f692