Merge "Set desktop icon to always use black for the icon" into tm-qpr-dev am: 8efad6b1

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



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