am b4ee5792: am b3084e87: Merge "Revert "Revert "Enable Launcher2 workspace import.""" into jb-ub-now-jolly-elf

* commit 'b4ee57927224429e34e3a81519b2ea658e41fc45':
  Revert "Revert "Enable Launcher2 workspace import.""