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

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

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