Merge "Revert "gtbs: Add Generic Telephone Bearer Service support""