[automerger skipped] Merge "Added throttle when reporting shortcut usage" into sc-dev am: e86f8e00d3 am: f827f1ddf5 am: afdd7b50cf -s ours am: 9edafbe935 -s ours am: 13062d116a -s ours am: 55b6c0505c -s ours

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

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

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