Merge "fs_mgr_get_mounted_entry_for_userdata: handle logical partitions"