[automerger skipped] Merge "Added throttle when reporting shortcut usage" into...

[automerger skipped] Merge "Added throttle when reporting shortcut usage" into tm-dev am: b170427a am: 02bb2393 am: 9e134743 am: 21035f24 -s ours

am skip reason: Merged-In I96370cbd4f6a55f894c1a93307e5f82dfd394652 with SHA-1 85f27940 is already in history

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



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