Snap for 12406339 from d282d157f8fa8589be6e25eaa02cb82b988c2b68 to 24Q4-release

Change-Id: I2f0142221626b504a3d22bffa1b05e3d70970f08
diff --git a/TwoPanelSettingsLib/src/com/android/tv/twopanelsettings/TwoPanelSettingsFragment.java b/TwoPanelSettingsLib/src/com/android/tv/twopanelsettings/TwoPanelSettingsFragment.java
index 0debc00..0f5642c 100644
--- a/TwoPanelSettingsLib/src/com/android/tv/twopanelsettings/TwoPanelSettingsFragment.java
+++ b/TwoPanelSettingsLib/src/com/android/tv/twopanelsettings/TwoPanelSettingsFragment.java
@@ -274,9 +274,10 @@
             }
         } else {
             // If there is no corresponding slice provider, thus the corresponding fragment is not
-            // created, return false to check the intent of the SlicePreference.
+            // created, return true so it won't be handled by onPreferenceTreeClick in
+            // PreferenceFragment, but instead onPreferenceFocused will handle it.
             if (pref instanceof SlicePreference) {
-                return false;
+                return true;
             }
             try {
                 Fragment fragment = Fragment.instantiate(getActivity(), pref.getFragment(),