Merge "Putting back generics for Workspace" into tm-dev am: 1a93004398 am: 84bc016469

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

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