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: a52e6532

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



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