Merge "[CrashRecovery] Separating out required files" into main am: 9bbbca9697

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

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