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

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

Change-Id: I49fef302c2092f4a1abdf5e36899057d41c98c38