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

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



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