Merge "Include activity reparent in transition" into sc-v2-dev am: f061f27f16 am: a0e83882d6

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

Change-Id: I6c57407701aa2f5fc1f1706c4d1b5e419dd5e280