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

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

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