[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 -s ours am: 0171c356 -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: Ia8e56f102a964f1f5d5747671df15546290427ca
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>