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

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

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