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

Merge "Don't overwrite persistent property files" into main am: 68fbe132 am: 4e79f5ca am: 259e7dba

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



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