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

Change-Id: I644fc487b90e4292d3a53f356e92c4ddee856aaa