Merge "Exclude the split-secondary offsets when auto-enter-pip" into sc-dev am: 739425e5 am: 0af8d670

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

Change-Id: Iaff19d8790584e0a9d26652c2e76290e1ace3295