Merge "Fix errorprone warnings that should be errors" am: 665bcf8220 am: 3e4a4d8819

Original change: https://android-review.googlesource.com/c/platform/external/emma/+/2254821

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