Merge "Refactoring metrics in CrashRecovery module" into main am: 0a5fd81cd3 am: b299b32793

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

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