Merge "Fix errorprone warnings that should be errors" am: 884eedabec am: 378012ba10 am: c6c4d8ad24

Original change: https://android-review.googlesource.com/c/device/google/atv/+/2256763

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