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: df66826e am: 851aec7f am: 27f4a392

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

Change-Id: Iade8e9f5b5fc406c47039d06b38101a74145de0b