aml_hef_341613000 (11465779,com.google.android.healthfitness)
Merge "Fix errorprone warnings that should be errors" am: 7f0a82177e am: 35ece4698b am: 0a0225c9c7

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

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