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

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

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