Merge "Migrate JDiff to new Javadoc" am: 5bf68823e6 am: 4d1cce4123 am: d19bba5454

Original change: https://android-review.googlesource.com/c/platform/external/jdiff/+/2505899

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