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

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

Change-Id: I5e3d994375d60af5990fdccb10e09403691010a9