Auto fixes from google3

Auto generated.

Some changes are undone by Winscope  linters, in these cases I'm keeping the Winscope as correct since that's easier for development at this time

Bug: 311642700
Test: npm run test:unit:ci
Flag: EXEMPT EXEMPT
Change-Id: Ie04fa6465e311136c92d62fe18a126e4593d2e7d
24 files changed