[automerger skipped] Merge "Revert "[CrashRecovery] Add module lib to Android...

[automerger skipped] Merge "Revert "[CrashRecovery] Add module lib to Android SDK"" into main am: 3d70bb0a am: 668d7c57 am: c0155c1a -s ours

am skip reason: Merged-In I5c65d85d50b214926f5473908694070b4e896201 with SHA-1 3816f262 is already in history

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



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