Merge "Integrate custom close action in ApiDemos for PiP" into tm-dev am: a6fffe1eb1 am: d959cfdd1d

Original change: https://googleplex-android-review.googlesource.com/c/platform/development/+/17716502

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