Merge "Fix work toggle button to be placed where it should be." into...

Merge "Fix work toggle button to be placed where it should be." into tm-qpr-dev am: 11147331 am: d7450579

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



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