Merge "apply staged property value when loading persistent props" into main...

Merge "apply staged property value when loading persistent props" into main am: f307ee07 am: 1176ff6c am: 42be1de6 am: 67205aa8

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



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