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

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



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