Fixes for errorprone update

When updating errorprone from 2.23.0 -> 2.32.0, more issues are found.

Bug: 253827323
Flag: EXEMPT refactor
Test: m RUN_ERROR_PRONE=true javac-check
Change-Id: I4a32dcd0bfffa109530ce0fdf439b5e801505db8
1 file changed