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

Merge "Add mixed-handler for unfold and mix in pip state" into udc-qpr-dev am: c18ce340 am: 65932e56

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



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