[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: fc35c722 am: 096ad526 -s ours am: 2ef62fdd -s ours

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

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



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