Revert^4 "Upgrade error_prone annotations to 2.4.0" am: 64eac7aeab am: a763168dde

Original change: https://android-review.googlesource.com/c/platform/external/error_prone/+/1552605

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I1ea0752ad06f3773c110cdcafa73a67b3e2a651f