Merge "don't call the reparent method when the old parent of task is removed."...

Merge "don't call the reparent method when the old parent of task is removed." into main am: 8ce3a826 am: 9249b8dc

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



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