[conflict] Merge "[CrashRecovery] Separating out required files" into main am:...

[conflict] Merge "[CrashRecovery] Separating out required files" into main am: 9bbbca96 am: b2091f16 am: abc4c92b

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



Bug: b/312712725
Change-Id: I59b01996bed2695a26c238dd60d0b067927e3779
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>