Merge "fix broken build on erorrprone" into tm-dev am: ad90ded7 am: 1ff6d5fd

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



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