[automerger skipped] Merge "Fix errorprone issues" into main am: fdbd2d10 am: 6b7becf6 -s ours

am skip reason: Merged-In Ia0e16b8be5284d13bed4366cbee0f92748bf2f85 with SHA-1 bcc608fb is already in history

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



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