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

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

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