Revert "Removing unnecessary iconFactory class when generating b..."

Revert submission 25483550-themed-badge

Reason for revert: b/314097390

Reverted changes: /q/submissionid:25483550-themed-badge

Change-Id: I7ad16d7c5d5457d350ac6cff86d512c2f57dbcbf
2 files changed