Merge "Revert "fix broken build on erorrprone"" into tm-dev am: cdcbebb7 am: 0821b066

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



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