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: 000b4250 am: 7afd77ae

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

Change-Id: Ia649b48391cf282ea867fbbb3ba44d5a62c312ed