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

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

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