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

Change-Id: I05af48cb79b3eaf9656302c8cdc6b94094b34655