Merge "Validate persistent properties file" am: 85d69af3 am: 0db7f482 am:...

Merge "Validate persistent properties file" am: 85d69af3 am: 0db7f482 am: b62f9c5d am: 52d98258 am: fed58db4

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



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