Merge "Ensure reparent activity TaskFragment is always within the same Task"...

Merge "Ensure reparent activity TaskFragment is always within the same Task" into tm-dev am: 74beca1b am: 1931d6d9 am: 4ca905ac am: 20e1f177

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



Change-Id: I9a9c5f8cabe4e83b2684a84871d2acfc457d72ba
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>