Merge "Fix errorprone issues" into main am: eb2e9e4776 am: bdd44e5242

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/3258078

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