Merge "Change the activity reparent to animate at TaskFragment level." into sc-v2-dev am: 21f6fdd842 am: a310195b5e

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

Change-Id: I41d25dc88f931b76344d545fec221d2acf6764e6