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

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



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