Merge "Respect force_mount_namespace in MountEmulatedStorage()." am: b828b6bf6c
am: a0d2e6f4b7

Change-Id: I4044e01b9de9bc502eda18fc34182629ca524701