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

[automerger skipped] Merge "Revert "Revert "Provide IconProvider in sysui dagger""" into sc-v2-dev am: 299b926b -s ours am: 06738f85 -s ours

am skip reason: Merged-In If4ab0590f4b850103411b6a2dccf2092bb06d563 with SHA-1 43047d3b is already in history

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

Change-Id: I89e97cb3ba5ceba280887e6a5381461938e4e7fd