Merge "Align taskbar so that it does not overlap with nav buttons." into tm-qpr-dev am: e008411f

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



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