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

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

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