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

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



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