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

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

Change-Id: I3b33a924f8bb2a06866bec9c8488faf7523975ad