[automerger skipped] Merge "Fix errorprone warnings that should be errors" am: 3836a8a8de
-s ours am: ab48f9ba47
-s ours am: 7336fbfcc8
-s ours
am skip reason: Merged-In I21aa58ebc02327849ed2161dbbafcdc806c007f2 with SHA-1 ac7318419a
is already in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2308772
Change-Id: I58a96df6c470fe6a0b6d35b1ad975c4f0cd49ae4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: