Merge "Part of fixing Splashcreen cts tests" into sc-v2-dev am: 2102a89ef6 am: 2e183c5ce6

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15341691

Change-Id: Ifb96ccede9ae2afa4520d4c7c90537bf6ebdf762