Merge "Refactoring recovery related code" into main am: c41f52c34f

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

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