Merge "Refactoring recovery related code" into main am: c41f52c34f am: aa32ee64bb am: 657c22c229 am: 774f23614f am: 89a4392bc5

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

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