Merge "Fix errorprone warnings that should be errors" am: 73c342652c

Original change: https://android-review.googlesource.com/c/platform/system/tools/hidl/+/2254750

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