[automerger skipped] Merge "Add mixed-handler for unfold and mix in pip state"...

[automerger skipped] Merge "Add mixed-handler for unfold and mix in pip state" into udc-dev am: eb51c3bd am: 7995a730 am: f69f20b3 -s ours am: 50720bf9 -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: If84ce47946b1dab5820e79de5b794d0955527d7b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>