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

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

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