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

Merge "Added throttle when reporting shortcut usage" into tm-dev am: b170427a am: 02bb2393 am: 9e134743

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



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