Merge "In MountEmulatedStorage() do not try to mount for mode MOUNT_EXTERNAL_NONE." am: c04b06dc81
am: 8bafcfe81c

Change-Id: I6e5b9eef6c2a6da1c3185d274afbfdec33d14a7a