[automerger skipped] Merge "Fix errorprone warnings that should be errors" am: 3836a8a8 -s ours

am skip reason: Merged-In I21aa58ebc02327849ed2161dbbafcdc806c007f2 with SHA-1 ac731841 is already in history

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



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