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

Merge "Merge "Fix flicker while resizing split screen" into tm-dev am: b80800cc am: 8549f847 am: 8548df25" into tm-qpr-dev-plus-aosp am: 8b48c13f

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



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