Merge "Restrict number of shortcuts can be added through addDynamicShortcuts" into sc-dev am: 110f1d8b26 am: ab7d63a77e am: fb370205d3

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

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