Merge "Fix black flash when launching dual split activity" into udc-dev am:...

Merge "Fix black flash when launching dual split activity" into udc-dev am: 50875ae2 am: 44c118e1

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



Change-Id: I5c8e3e7cdea3ed828a84c4955b74b0250f34ee8d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>