Merge "Fix for EditShortcutsPreferenceFragmentTest to mock the correct AccessibilityTarget fields" into main