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

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

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