Merge "Fixing some errorprone build rules" into sc-dev am: 631767d919 am: e7f0059c95

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

Change-Id: I6936a439bdef3fa2a0639d35bfd019e3a93560b4