[automerger skipped] Merge "Add mixed-handler for unfold and mix in pip state" into udc-dev am: eb51c3bd am: a05b6673 -s ours

am skip reason: Merged-In I872c8326dfa4662feecb45e2d2b4fd7b042a9123 with SHA-1 7567b9b5 is already in history

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



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