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: I80cfb1a0573fb9ba96356edd4b3a27c317ae9b2a