Merge pull request #6818: Fix errorprone to version 2.3.1 on release-2.7.0 branch