Merge "[Build Blocking] Fix conflicting resource IDs for work tab" into sc-dev am: b8cec440cc am: 22617e92ca am: 9f02e74e23

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

Change-Id: Ie10bee832cddb0f0bf87aae573d6892b20505b6c