Merge "Remove trailing whitespace in java files" into main am: 4242411dce am: 2a3e5726bb am: 09938676e8

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

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