Merge "Putting back generics for Workspace" into tm-dev am: 1a930043

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



Change-Id: I6bc5e5901897c088431800fa82eb54dfe7c30990
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>