Merge "Fixing icon cache thrashing due to an unsupported icon" into udc-dev am: 6c8d57d8b5 am: d063440188

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

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