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 tm-dev am: 7b47cfaf

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



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