Merge "Reparent PiP menu under the PiP task" into udc-dev am: 05ff1347 am: 5cf733c3 am: 8be91cb4

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



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