Merge "fs_mgr: remain elapsed time of fsck in prop" am: 5d4855680d

Change-Id: I057410e062f702c8543e5c9ca9f02c926d80c023