Merge "Restrict number of shortcuts can be added through addDynamicShortcuts"...

Merge "Restrict number of shortcuts can be added through addDynamicShortcuts" into sc-dev am: 110f1d8b am: ab7d63a7 am: fb370205 am: ebab9abb am: 74d48a21 am: 229d5594 am: 0bf2b2bb am: 06a33f25

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



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