Merge "Fix lint error in errorprone target (only in tm-qpr-dev)" into...

Merge "Fix lint error in errorprone target (only in tm-qpr-dev)" into tm-qpr-dev am: ec6c2591 am: a9934f00

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



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