[automerger skipped] Merge "Provide IconProvider in sysui dagger" into...

[automerger skipped] Merge "Provide IconProvider in sysui dagger" into sc-v2-dev am: f426ad97 -s ours am: 5109b11d -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/+/16051988

Change-Id: Ieb34ee1eb4cd7dafc794bc88ff3489297f857409