Merge "Unifying icon loading methods" into sc-dev am: 44ba9f2e14

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

Change-Id: I1472b9bf0575a23be244cb4b9014ddf4ffc7a3be