Also remove BADGE_ICONS flag as it is no longer used or necessary. Bug: 64561196 Change-Id: Icf9656537459a7dbad3a07830eedbdeec8d8f1ce