Adding a feature flag to disable icon overrides

Bug: 226388663
Test: Verified locally by disabling the feature
Change-Id: Icfbe790046209b15dbdc0e44dcf1a14f1f50de62
2 files changed