Merge "Fix pip enter/expand from split-screen secondary." into rvc-dev am: 074701fa30 am: b378f6bc21

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

Change-Id: I4eea261237478e1ed801bdc052b1c2d80e165369