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

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

Change-Id: I4411999a6e62aa57d1f05e2d6b6d24db1555742a