Merge "Fixes for errorprone update" into main am: 67bb3d4e5d

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

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