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: f5e8b2a5 am: b71609a8 am: 5ce9924a

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



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