Merge "changed name and dimensions of work_mode_toggle button, changed outline to surface for the (x) icon.." into tm-dev am: 5a726787db am: 2641cdbd8a

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

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