[automerger skipped] Fix errorprone warnings that should be errors am: 37cfdc7536
-s ours am: a0dd446e61
-s ours am: a5572aff15
-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: I9c0a4b8a817eda318e5e66bc62c0671d9a9b40bc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: