Merge "Added throttle when reporting shortcut usage" into tm-dev am: b170427ab8 am: 3365b56c7b

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

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