Merge "Fix AnnotatedElement.getDeclaredAnnotation() generic signature"
am: bd32321b4f

Change-Id: I17c55503e18f5f189e56fc0e4fed21616f14f3b0