Merge "Remove white boarders from Shortcut Category icon" into udc-dev am: 9cba6b6751

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

Change-Id: Id5f94c337c2acf6ddd62247334b90b1f03531b7a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>