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

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

Change-Id: I8f08a563949d7479c8a74dfe409ee24797232346