Merge "Errorprone: Move new 2.3.2 ERROR warnings to ERROR"
am: 0ee385f8bc

Change-Id: I7ff437b16d7d431d8e9fb4b74f11ff10c2df42df