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

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

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