Merge "Fix the transition from Split to PiP" into sc-v2-dev am: 54fed092f8

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

Change-Id: I6b1fba80348615129bcabf11debd19a758b8e41c