Merge "reorder System shortcuts for taskbar and secondary display" into...

Merge "reorder System shortcuts for taskbar and secondary display" into tm-qpr-dev am: bc65c3d4 am: a106266c

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



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