Merge "Fix errorprone build" into sc-dev am: 871895da4f

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

Change-Id: Iad1d79fe13f22fa05f906eb12d20600dad9e0590