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: bdfde51c am: 3bbb8d1d

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



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