Merge "Fix split dismissed after click pip to split button" into sc-v2-dev am:...

Merge "Fix split dismissed after click pip to split button" into sc-v2-dev am: 6a2ce827 am: 5611fc6c

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

Change-Id: I231cfa55010874edb1631bbed8dcb0519e8679a7