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: Ieeb49795dbc56b242027bec865149b0442f6a8a4
Merged-In: Ic959b3f579a7e98cb6c423b2e6359ce22686a2a2