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

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

Change-Id: I512d85536566883829bd3345c216248b06e00303