[automerger skipped] Merge "Restrict number of shortcuts can be added through...

[automerger skipped] Merge "Restrict number of shortcuts can be added through addDynamicShortcuts" into rvc-dev am: 0e03b8d4 am: 87de7ffc -s ours am: 285b8a1b -s ours am: 79be2c99 -s ours am: 39abde02 -s ours am: 6b74b34a -s ours am: a2afc42c -s ours am: d06e0acf -s ours

am skip reason: Merged-In Ib3eecefee34517b670c59dd5b8526fe9eb24f463 with SHA-1 3215e73e is already in history

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



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