Merge "Fix errorprone warnings that should be errors" am: 05480411 am: bfaf8b28 am: f131a197

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



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