Merge "Fix the incorrect result of AccessibilityShortcutStats" into sc-v2-dev am: f1ecb2678c am: c70b0dcb7f

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

Change-Id: If015f808092364353a40623ef30b4bd87e8e7d74