[automerger skipped] Merge "Revert^2 "[CrashRecovery] Add module lib to Android SDK"" into main am: b87d24f321 am: b275e5c593 -s ours

am skip reason: Merged-In If6789fee9a908231babd7624280b40515d377dfe with SHA-1 919593c804 is already in history

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

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