Merge "Fix ModifierShortcutManagerTests on AOSP build." into main