Merge "Prevent reparenting to a fallback target while relaunching a pinned...

Merge "Prevent reparenting to a fallback target while relaunching a pinned task" into tm-qpr-dev am: f2ec759e

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



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