[automerger skipped] Merge "Revert "[CrashRecovery] Add module to BCP and...

[automerger skipped] Merge "Revert "[CrashRecovery] Add module to BCP and SSCP"" into main am: a463723f am: f50faa40 am: a403e1a0 -s ours

am skip reason: Merged-In I39dfab62897d907023720b594d6929397403d314 with SHA-1 d9199eb8 is already in history

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



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