Merge "Revert \\"LauncherApps should also throw when user is locked\\" am: 2ec16b08ac am: e330d59c2e am: 685091f203"