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

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



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