Merge "In MountEmulatedStorage() do not try to mount for mode...
Merge "In MountEmulatedStorage() do not try to mount for mode MOUNT_EXTERNAL_NONE." am: c04b06dc am: 8bafcfe8 am: 7fb2305d
am: a436aeb3
Change-Id: I88474b6f50ae7cfab40ba44ff1da0df6021a2fb0