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

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

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