Merge "Fix the incorrect result of AccessibilityShortcutStats" into sc-v2-dev