Merge "Revert "Fix pip enter/expand from split-screen secondary."" into...

Merge "Revert "Fix pip enter/expand from split-screen secondary."" into rvc-dev am: 5e980bfd am: 7f158ffe

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

Change-Id: I3bffbee234a4325383fee96a76e519817e95a2c2