Merge "fs_mgr: use ro.persistent_properties.ready"
am: 3f04e9e350

Change-Id: I9baa4333f52caf78f56d4be08de351d11315c0eb