Some fixes for AnnotatedTypes mapping #32422

Job	Run time
community_build_a	53m 47s
community_build_b	1h 27m 22s
community_build_c	1h 0m 28s
MiMa	13m 20s
test	52m 42s
test_non_bootstrapped	0s
test_sbt	17m 25s
test_scala2_library_tasty	0s
test_windows_fast	28m 14s
test_windows_full	0s
build-msi-package	0s
test_java8	0s
build-sdk-package / build	8m 13s
build-chocolatey-package / build	18s
test-chocolatey-package	0s
publish_nightly	0s
publish_release	0s
nightly_documentation	0s
open_issue_on_failure	0s
	5h 21m 49s

Provide feedback