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

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

Change-Id: I0cbc0c1ec9775bff471693fc2cea5618bf3b9777