Merge "set ro.boottime.persistent_properties when persisted props are restored"