Merge "Fix potential crash when TaskFragmentOrganizer died" into tm-qpr-dev am: 66dbafa0a1

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

Change-Id: I6445f15e726d10802333e4a380e1cc5b9c93c4eb
Signed-off-by: Automerger Merge Worker <[email protected]>