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

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

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