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

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



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