Merge "Merge "Add TaskFragmentOrganizer#onActivityReparentToTask" into tm-dev am: 0b91be72 am: 01319922" into tm-d1-dev-plus-aosp am: a4c5ca17 am: fcc764d6

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



Change-Id: Ie3ecc8a335c7d6d0db33d45b4586fc53ede749cb
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>