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

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



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