Merge "Fix flicker when entering PiP from split-screen / overview" into tm-dev...

Merge "Fix flicker when entering PiP from split-screen / overview" into tm-dev am: 778b5e6b am: a53f1fb8

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/17762727



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