fe23e711fd
This reverts commit 00fb1adab4.
Also fixes test applyIconAndLabel_setsImageSpan_whenInactiveArchivedApp.
Bug: 350758155
Fixes: 356166053
Test: unit test
Flag: com.android.launcher3.enable_new_archiving_icon
Change-Id: I93f2ac47dc3a8fa81d59e0f089385d2b3fe93306