Merge "Fix errorprone issues" into main am: eb2e9e4776

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

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