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

Original change: https://android-review.googlesource.com/c/platform/development/+/2254753

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