Merge "Merge "Reset original task surface after reparenting to PiP" into...

Merge "Merge "Reset original task surface after reparenting to PiP" into tm-qpr-dev am: f6970011" into tm-qpr-dev-plus-aosp am: 08aeb56d

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



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