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

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

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



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