Merge "Refactoring RescueParty for CrashRecovery" into main am: 01fdab6a0c am: 628aaed486

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

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