Merge "Add crashrecovery build flag to move files" into main am: be9ab02c42 am: e1028e77fe

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

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