Merge "Added throttle when reporting shortcut usage" into sc-dev am: e86f8e00

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



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