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 am: 451f611c

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



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