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

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



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