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

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

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



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