Merge "Revert "Clear only workspace shortcut / widget related tests"" into sc-v2-dev am: 06146a1944

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

Change-Id: I01c5c7eb9166704a0d5d36f4cb0f9ad497a494c8