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

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

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