Merge "In MountEmulatedStorage() don't create a mount namespace unless actually mounting." am: c0aacbe513 am: ae06fba67a
am: b82970846b

Change-Id: I02bb609e76bd44130e9d3dd4082e134d935376cd