Merge "Fix flicker while resizing split screen" into tm-dev am: b80800cc am:...

Merge "Fix flicker while resizing split screen" into tm-dev am: b80800cc am: 8549f847 am: 8548df25

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



Change-Id: I7d0599a5a1fde790b53ae234790e52c9660b5f29
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>