Merge "Refactoring recovery related code" into main am: c41f52c34f am: aa32ee64bb am: 657c22c229

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

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