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

* commit '0572c31031ea2a0cc9f33afb2b2a4a41618415df':
  Revert "Revert "Enable Launcher2 workspace import.""