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: ef5c3e0c am: 291ab4a2 am: 7cd3bd29

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



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