[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: 3365b56c am: 4bb66ea3 -s ours

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

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



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