Merge "Merge "Handle onActivityReparentToTask for activity in other process" into tm-dev am: 9b36cc92" into tm-dev-plus-aosp am: 88ae4068

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



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