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

[automerger skipped] Merge "Added throttle when reporting shortcut usage" into sc-dev am: e86f8e00 am: f827f1dd am: afdd7b50 -s ours am: 9edafbe9 -s ours am: 13062d11 -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/+/25522017



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