Remove the second target for ConnectedApPreference

Also create new gear layout since previous one has its own
ripple, which conflicts the normal preference ripple.

Fixes: 72528535
Fixes: 72442172
Test: Screenshot | RunSettingsRoboTests

Change-Id: I6a253574d0a5c971104c157584d66c3312764a26

tests/robotests/src/com/android/settings/wifi/ConnectedAccessPointPreferenceTest.java

@@ -16,6 +16,8 @@
 
 package com.android.settings.wifi;
 
+import static com.google.common.truth.Truth.assertThat;
+
 import static org.mockito.Mockito.doReturn;
 import static org.mockito.Mockito.never;
 import static org.mockito.Mockito.verify;
@@ -75,4 +77,9 @@ public class ConnectedAccessPointPreferenceTest {
         verify(mOnGearClickListener, never()).onGearClick(mConnectedAccessPointPreference);
     }
 
+    @Test
+    public void testWidgetLayoutPreference() {
+        assertThat(mConnectedAccessPointPreference.getWidgetLayoutResource()).isEqualTo(
+                R.layout.preference_widget_gear_no_bg);
+    }
 }