Merge "Fix errorprone warnings that should be errors" am: 05480411c5 am: bfaf8b288b

Original change: https://android-review.googlesource.com/c/platform/bootable/recovery/+/2256446

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