Merge "skip anno-only mixin columns that are overridden on subclasses" into main

diff --cc lib/sqlalchemy/orm/decl_base.py
Simple merge

diff --cc test/orm/declarative/test_tm_future_annotations_sync.py
Simple merge

diff --cc test/orm/declarative/test_typed_mapping.py
Simple merge