Merge changes from topic "am-2c63fa1e59454e9991156d52d9080e19" into sc-v2-dev-plus-aosp

* changes:
  Merge "[automerger skipped] PiP: Disable enterSplit for now. am: 5c107b0b59 -s ours" am: f9efc14381 -s ours am: fa85e5eb34 -s ours
  [automerger skipped] PiP: Disable enterSplit for now. am: 5c107b0b59 -s ours am: b2bf928783 -s ours am: 0c8fa4dc03 -s ours