Merge "Fix errorprone warnings that should be errors" am: 908e39bb6c am: 933457343a Original change: https://android-review.googlesource.com/c/platform/external/xmp_toolkit/+/2256747 Change-Id: I2705809d511b5812f67346bc1acf7102d1e0a394 Signed-off-by: Automerger Merge Worker <[email protected]>