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

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

Change-Id: I386625f1bc35bec566e083ad5157cb253d9710aa