Merge "[CrashRecovery] Conditionally add module lib to Android SDK" into main am: 9891943a11

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

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