[automerger skipped] Merge "apply staged property value when loading...

[automerger skipped] Merge "apply staged property value when loading persistent props" into main am: f307ee07 am: 1176ff6c am: 42be1de6 am: 67205aa8 am: 170da29a -s ours

am skip reason: Merged-In I81b6bd984aad8f7ddec93ce74f4543e4f71be508 with SHA-1 ecf8e1cf is already in history

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



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