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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: If5f16650f3bf90d5f5c03e561efff82f7a965f38