[automerger skipped] Merge changes from topic "icon-thrashing" into tm-qpr-dev...

[automerger skipped] Merge changes from topic "icon-thrashing" into tm-qpr-dev am: f2d09fe4 am: bcdd3ff6 -s ours

am skip reason: skipped by user sunnygoyal

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



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