Merge "Fix stack reference is not updated when task organizer is dead." into...

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

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

Change-Id: I6b1d5ac41a64fc09febafcbd744a84e88633f4d6