[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: 47d180fc -s ours am: 65868a4e -s ours am: 332059c2 -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: Ic4e52af1553aa5d04d2073201a786824bb34e0a5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>