Merge "Fix errorprone issues" into main am: 257d913665

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

Change-Id: Ia627addfa63392a231418c425dc4a288883dd999
Signed-off-by: Automerger Merge Worker <[email protected]>