Merge "Fix errorprone warnings that should be errors" am: 908e39bb6c am: 933457343a am: 986d652261

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

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