[automerger skipped] Merge "Fix check for thread unwind." am: 7e1042d0 am: b16a79b1 -s ours

am skip reason: Merged-In I70fffc5d680256ce867e7a1d427593b584259160 with SHA-1 2d5d46ca is already in history

Original change: https://android-review.googlesource.com/c/platform/system/core/+/2107186



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