Merge "Fix stack reference is not updated when task organizer is dead." into rvc-dev am: 70511db961 am: df66826e9a

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12068938

Change-Id: I02c123b1f137138e9094f74ec0ae4b255b499bdf