[1.7.x] Optimized make_aware/naive by removing redundant checks. Refs #22625.

Also added tests with pytz and removed misplaced tests.

Backport of 1109ebd from master