Merge "Fix errorprone warnings that should be errors" am: 7f0a82177e

Original change: https://android-review.googlesource.com/c/platform/external/apache-xml/+/2254754

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