Merge "Fix errorprone warnings that should be errors" am: 654e9d6d

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2308090



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