Merge "Fix thread unwind in CallStack." am: 16909c5f am: 4cea1cd5 am: 05009ec9 am: 34194c8d

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



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