Merge "Added throttle when reporting shortcut usage" into tm-dev am: b170427ab8

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

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