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

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

Change-Id: I199e58341b878a0a200cf18d1b97850be481a45d