Merge "Restrict number of shortcuts can be added through addDynamicShortcuts" into sc-dev am: 110f1d8b26 am: ab7d63a77e am: fb370205d3 am: ebab9abbd8 am: 74d48a21e3 am: 229d55948c am: 0bf2b2bb99 am: 06a33f25b4

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>