Merge "Refactoring recovery related code" into main am: c41f52c3 am:...

Merge "Refactoring recovery related code" into main am: c41f52c3 am: aa32ee64 am: 657c22c2 am: 774f2361 am: 89a4392b

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>