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

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

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