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

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

Change-Id: I7289e0d841942d52bca2d4fd6d621958a71741f8