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

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

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