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

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

Change-Id: I9a866a3dfae07f52b2cd013b48b01b8de33a9e54