Merge "Implement PiP custom close action on phone" into tm-dev am: 500043a4

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



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