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: I7dcf798dba1b7480ea57dcf00d87a1abdd117266