Merge "Prepare /data/property before load_persist_props" am: 77cff055 am:...

Merge "Prepare /data/property before load_persist_props" am: 77cff055 am: 1315ce39 am: 325e869e am: 37124623

Original change: https://android-review.googlesource.com/c/platform/system/core/+/2185287



Change-Id: I5514a4df61699a47897d5cc612223c386ebd58d3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>