Merge "[automerger skipped] PiP: Disable enterSplit for now. am: 5c107b0b -s...

Merge "[automerger skipped] PiP: Disable enterSplit for now. am: 5c107b0b -s ours" am: f9efc143 -s ours am: fa85e5eb -s ours am: 07190310 -s ours am: cd684db7 -s ours

am skip reason: Merged-In I6237dd1c88f50733ab24e45806c413d5777032e9 with SHA-1 c03eca68 is already in history

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

Change-Id: I4d60bc658d36b998a379442bea6954bf7dca5dd5