Merge "Fix missing check empty style splash screen when task switch." into sc-v2-dev am: 7bf1e9b7

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

Change-Id: Iaf310869a0adfcdf7d5b5d679f23903f49682122