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

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

Change-Id: I400e63bea96eaf3d57e131bbb1417eaca3c806c6