Merge "Fix errorprone warnings that should be errors" am: dc30d90c05

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Camera2/+/2255053

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