Merge "Optimizing some icon generation code:" into tm-qpr-dev am: 415fe0c183

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

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