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

[automerger skipped] Merge "[CrashRecovery] Add module to BCP and SSCP" into main am: d1aa0735 am: 671df010 am: dd87452a -s ours

am skip reason: Merged-In I488730c04ba361955344f2c41a265836923307a6 with SHA-1 a7044079 is already in history

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



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