Merge "Limit the number of shortcuts per app that can be retained by system"...

Merge "Limit the number of shortcuts per app that can be retained by system" into sc-dev am: d8bf6af4 am: 2e79de04

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/21574889



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