Merge "Remove trailing whitespace in java files" into main am: 4242411dce

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

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