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

Change-Id: I815654df758200596b949943738608cd42ecdc40