Merge changes from topic "icon-thrashing" into tm-qpr-dev am: f2d09fe4

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



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