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

Change-Id: Id8d0d78e01bd8e0e876fa4564eee67fe18937065