Merge "Demote ComparableType errorprone warning" into main am: 59d5f58dfb

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

Change-Id: If388652820a03e48898a0efa322bc0c123bcd148
Signed-off-by: Automerger Merge Worker <[email protected]>