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 rvc-dev am: 15ae228d

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



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