[automerger skipped] Merge "Fix blank pink loading icons by ensuring that cache entry won't downgrade existing icon." into 24D1-dev am: 9f03ea256d -s ours

am skip reason: Merged-In I8aac643ec5ca3162cd62bf1051cc751800c626dd with SHA-1 d073ab0b39 is already in history

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

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