BUG: Concatentation of TZ-aware dataframes (#12396) (#18447)
closes #12396 
closes #18447
- [ ] tests added / passed
- [x] passes `git diff upstream/master -u -- "*.py" | flake8 --diff`
- [x] whatsnew entry
