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

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

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



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