Merge "Fix errorprone warnings that should be errors" am: 2f5262e9c9

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

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