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

Merge "Restrict number of shortcuts can be added through addDynamicShortcuts" into rvc-dev am: 0e03b8d4

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



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