Merge "Revert "[CrashRecovery] Add module lib to Android SDK"" into main am: 3d70bb0a5d am: 668d7c576a

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

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