Merge "Make BaseIcon.Workspace so that it can be overriden." into sc-dev am: 8a51f11b63 am: bd5a18f298 am: 11e2870ec0

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

Change-Id: Ied2fcb75a8a283af23479e418da6efb2502856b2