Merge "Fix errorprone warnings that should be errors" am: fccd9db8cf

Original change: https://android-review.googlesource.com/c/platform/external/jsilver/+/2254823

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