Merge "Enable 3 button nav for taskbar" into sc-v2-dev am: ae7c8cacd5

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

Change-Id: Id5b929c6c9bd0dfa066e63ee6fc5636d3dc50512