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

Change-Id: Ia2b865c56a92265151444b4b7310b61c51a9a952