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 am: b7096559

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



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