Merge "Don't overwrite persistent property files" into main am: 68fbe132 am:...

Merge "Don't overwrite persistent property files" into main am: 68fbe132 am: c5dec993 am: d21e11b0

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



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