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

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

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