Merge "set ro.boottime.persistent_properties when persisted props are restored"
am: 73c6544b08

Change-Id: I97c564b93fbc37a898ca937f2d28f372c6687fe7