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

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

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