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: Idecc998a84c9bd209db18760f9f70414a2ae1e12