Merge "Override displacement for transient taskbar instead of mCurrentShift" into tm-qpr-dev am: da858aab44 am: ed63ab8e14

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

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