Fixes for errorprone update

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

Bug: 253827323
Test: m RUN_ERROR_PRONE=true javac-check
Change-Id: I65cd7863b3c356d9b0ad4b04cbc16ce966566216