Merge "Fixes for errorprone update" into main am: da86eed6e5

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

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