Merge "Revert^2 "Utils required for CrashRecovery module"" into main am: d5e36cdf2e am: 796435d43a

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

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