Merge "Removing some dependency on icon shape" into sc-dev am: 7fb983d5e3 am: d5ea74f7d4

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

Change-Id: I0c369c552d766532a9d6b57d66e02b436ec864b7