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

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

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