[automerger skipped] Merge "Fix errorprone warnings that should be errors" am:...

[automerger skipped] Merge "Fix errorprone warnings that should be errors" am: 3836a8a8 -s ours am: ab48f9ba -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: I0b3a6d8f77a24cc8536503e1f1bedbb35ad54130
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>