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