Merge "Allow class kind to be used in AnnotationTypeDoc" into main am: b0cd698af8

Original change: https://android-review.googlesource.com/c/platform/external/doclava/+/2952808

Change-Id: I516c3128354574870ae6c1d6f5fc3346198a2930
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>