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

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

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