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

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

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