Merge "Ensure reparent activity TaskFragment is always within the same Task" into tm-dev am: 74beca1b am: 1931d6d9 am: 3be0b447

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



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