Merge "Convert system/core/fs_mgr to Result::ok()" am: 9421b60aef

Change-Id: If48aec0a4de1ca61e570ed829356c3bd927b6f94