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: 06452fc3

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



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