Refactoring BindableServiceQueue into CallQueue and ManualServiceQueue