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

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

Change-Id: I0b0c17673f9d1079ab929cd35261a67663e3505f