Merge "Adding a feature flag to disable icon overrides" into tm-dev am: 59c535bb

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/17359924



Change-Id: I35e310b08684457bce038169f3d509a1a18f819a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>