[automerger skipped] Merge "Add aconfig flags to CrashRecovery" into main am: 1a57ec3304 am: 33b1f83807 -s ours

am skip reason: Merged-In Ia33fc91fe15a1eae5e8954fdaef6081f9ccf6f8d with SHA-1 41431a3886 is already in history

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

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