Merge "Fixed overlap issue where toggle button gets overlapped by 3 button nav bar..now button shifts up so it's not totally obscured" into tm-dev am: 32f1e89193 am: 6b65dc9814

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

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