Merge "Update the failure while start activity in TaskFragment" into sc-v2-dev am: c785a6ac16 am: 9900aed25d

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

Change-Id: Id2a2a9c5cca7fa86a7b1058e80fa886157c7a136