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

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

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