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

Change-Id: Ifebdb2473b434e489d7b516820a5f9ce3837178c