Merge "Fixes for errorprone update" into main am: 67bb3d4e5d am: 44884157f9 am: 7b6e4fff5a

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

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