Merge "Reparent PiP overlay under task as soon as possible" into udc-dev am: ccafc6b32d am: 493959cab9

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

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