Merge "Revert "[CrashRecovery] Refactor SystemProperties as api"" into main am: 4c1adfc5c4

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2943266

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