Merge "Fix errorprone warnings that should be errors" am: 403215474e

Original change: https://android-review.googlesource.com/c/platform/frameworks/rs/+/2255052

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