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

Change-Id: Id1d1d8ea2f6a6733cabdec00fdd7c22911ef43e7