Merge "Add mixed-handler for unfold and mix in pip state" into udc-dev am: eb51c3bd

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



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