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

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

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