Merge "Remove trailing whitespace in java files" into main am: 4242411dce am: 5d31bf885f am: 273dec4453

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

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