Merge "Fix errorprone warnings that should be errors" am: 908e39bb6c

Original change: https://android-review.googlesource.com/c/platform/external/xmp_toolkit/+/2256747

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