Merge "[CrashRecovery] Separating out required files" into main am: 9bbbca96 am: ca7eba3f am: f5008fe9

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



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