Merge "Fix thread unwind in CallStack." am: 16909c5fc7 am: 4cea1cd5ce

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

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