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

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

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