Merge "PiP: Re-attach PiP menu when display changes." into tm-dev am: ec56afe3

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



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