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

Merge "Merge "Do not offset PiP when auto-enter-pip is ongoing" into tm-dev am: d05dbf68 am: 4ef0a619" into tm-d1-dev-plus-aosp am: 457387fd am: ceb31794

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



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