Merge "use ro.persistent_properties.ready for persistent props ready" am: 22cc398d76 am: 37bdcfcbdb
am: 6ca378ba56

Change-Id: I46264839055316ee88decfd6081e6548557bd3e6