Merge "Remove gesture shortcut restoration/merge logic from AMS" into main

                                        newValue, restoredFromSdk);

                            }

                        }

                        // Currently in SUW, the user can't see gesture shortcut option as the

                        // navigation system is set to button navigation. We'll rely on the

                        // SettingsBackupAgent to restore the settings since we don't

                        // need to merge an empty gesture target.

                        case Settings.Secure.ACCESSIBILITY_BUTTON_TARGETS,

                             Settings.Secure.ACCESSIBILITY_GESTURE_TARGETS,

                             Settings.Secure.ACCESSIBILITY_QS_TARGETS,

                             Settings.Secure.ACCESSIBILITY_SHORTCUT_TARGET_SERVICE ->

                                restoreShortcutTargets(newValue,