Android U Beta 1 GPL
Merge "Fix errorprone warnings that should be errors" am: 7f0a82177e am: 35ece4698b

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

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