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

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



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