Remove onClickableListener on MainSwitchBar's switch since it has been set to not focusable and not clickable. am: 08eeec366e am: 33ce2b02d1

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18344583

Change-Id: Ide50e771d8f5b546992df19181f4451acf70ce60
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

packages/SettingsLib/MainSwitchPreference/src/com/android/settingslib/widget/MainSwitchBar.java

@@ -30,7 +30,6 @@ import android.widget.Switch;
 import android.widget.TextView;
 
 import androidx.annotation.ColorInt;
-import androidx.annotation.Nullable;
 
 import com.android.settingslib.utils.BuildCompatUtils;
 
@@ -122,15 +121,10 @@ public class MainSwitchBar extends LinearLayout implements CompoundButton.OnChec
         propagateChecked(isChecked);
     }
 
-    @Override
-    public void setOnClickListener(@Nullable OnClickListener l) {
-        super.setOnClickListener(l);
-        mSwitch.setOnClickListener(l);
-    }
-
     @Override
     public boolean performClick() {
-        return mSwitch.performClick();
+        mSwitch.performClick();
+        return super.performClick();
     }
 
     /**