[automerger skipped] Merge "Add crashrecovery build flag to move files" into...

[automerger skipped] Merge "Add crashrecovery build flag to move files" into main am: 7f081d92 am: 0c1bb638 -s ours

am skip reason: Merged-In Id3674bd6a8a32f64d189b8ac17b222b9d7966f69 with SHA-1 b9d09c68 is already in history

Original change: https://android-review.googlesource.com/c/platform/build/+/2942585



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