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: I6c0ed651ec19f15f95702301a3d380f5056863ac
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>