Merge "Fix errorprone warnings that should be errors" am: d8afb5196c

Original change: https://android-review.googlesource.com/c/platform/external/smali/+/2256782

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