Merge "Consider destruction of activity for task removal" into sc-v2-dev am:...

Merge "Consider destruction of activity for task removal" into sc-v2-dev am: 839efc2a am: b763a495

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

Change-Id: I01b12b1c295a5b9627f15e627c4c90dc88d39351