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

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



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