Merge "Correcting Taskbar Icon Layout bounds when Taskbar Divider is present" into udc-qpr-dev am: d34fe6d60c am: 14b1fdfba3

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

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