[automerger skipped] Merge "Handle auto-pip change in split handling...

[automerger skipped] Merge "Handle auto-pip change in split handling transitions" into udc-dev am: 277bbab1 am: 4165f7ce -s ours am: ed1d6497 -s ours

am skip reason: Merged-In I5c723000e7ddc6a96b8992960845400c152ed3d2 with SHA-1 6f26f1e7 is already in history

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



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