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

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

Change-Id: I4830d75e5883597d735cc4a7468b5d41a6cc08d2