[automerger skipped] Merge "Revert^2 "Revert "Provide IconProvider in sysui...

[automerger skipped] Merge "Revert^2 "Revert "Provide IconProvider in sysui dagger""" into sc-v2-dev am: d41437ab am: 4d8c0708 -s ours

am skip reason: Merged-In If4ab0590f4b850103411b6a2dccf2092bb06d563 with SHA-1 d5abf607 is already in history. Merged-In was found from reverted change.

Reverted change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16063846

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16085830

Change-Id: I7c87107f4d6402868e48ab9e234e0634366c53bf