Tax Year Prior to 2020: Is my self-employment tax included in the federal/state tax numbers due on the screen?