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

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



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