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