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

Change-Id: I96c16db9b8fcd197709179429de07a77cbabe5e8