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

Change-Id: Icb82fb72966431be856b202e113095c3f11920cc