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

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

Change-Id: Id1b65f8f9f995e8fd094f274e20c20e25d5cdc73