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

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

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