Merge "Show 3 button nav on phone in Taskbar (1/2)" into tm-qpr-dev am: 89be3a4c

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



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