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

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



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