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

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

Change-Id: I409cf319365ee2554236f5113dd8cc464f874367