Merge "Fix errorprone warnings" into main am: 8a281b4ef8

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

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