Merge "Move NavButtons to end of taskbar" into sc-v2-dev am: 6d2dd7a9e4

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

Change-Id: I3b5bfe78c9da0a2215c376cb0f2007fb735d4a30