Merge "Add crashrecovery build flag to move files" into main am: f65d3c959d am: 97c5e7cdc9

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

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