Putting back generics for Workspace

This got over-written in merging files

Bug: b/218186705
Test: Manually tested Launcher3 works.
Change-Id: I55287e110d067a338204924337091ead044b34ec
1 file changed