Merge "Match new errorprone api" into main am: e7980ecd5b

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/3302485

Change-Id: I3edeb969289a50946c380713e04491d44baec433
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>