Merge "[automerger skipped] PiP: Disable enterSplit for now. am: 5c107b0b59 -s ours" am: f9efc14381 -s ours
am skip reason: Merged-In I6237dd1c88f50733ab24e45806c413d5777032e9 with SHA-1 c03eca68e2 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17061636
Change-Id: I1b6c09c358466437c2c78764097f2c3977ec3ac9
This commit is contained in: