Merge "Adding support for customizing shortcut pinning logic" into tm-qpr-dev am: 85d15e78d0 am: ba88f8f880

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

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