[automerger skipped] Prepare /data/property before load_persist_props am:...

[automerger skipped] Prepare /data/property before load_persist_props am: b0bb60cb -s ours am: 4b7e2576 -s ours

am skip reason: Merged-In I5819a97750e4d5d1ee5a7c308bf944c7aeab2f90 with SHA-1 95614963 is already in history

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



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