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

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

Change-Id: Id655c3550d3caab8b5a2b6ae581a40306a84aa9c