Merge "Do not offset PiP when auto-enter-pip is ongoing" into tm-dev am: d05dbf68

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



Change-Id: I84e028bb9e6de45aa27aaef5361ce08e9be46a16
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>