[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: 56e9a857 -s ours am: 058e84c1 -s ours

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

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



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