Ignore type parameters when looking for metadata (#12873, #12900)

All code populating the TypeDataStore is generated using
writeClassLiteral which strips away all type parameters, so the code
doing lookups should also do the same to maintain compatibility.

Change-Id: I01654f4cc15188a12c735ffed55d30a34c77a064