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

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

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