Merge "Handle onActivityReparentToTask for activity in other process" into tm-dev am: 9b36cc92 am: 38292549 am: 0bdcf608

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



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