Merge "Fix errorprone warnings that should be errors" am: eb8582344b am: 123b01e28f

Original change: https://android-review.googlesource.com/c/platform/development/+/2254753

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