Merge "fs_mgr: use ro.persistent_properties.ready"