Merge "Show default description only if description and html description are empty" into rvc-dev

tests/robotests/src/com/android/settings/accessibility/AccessibilitySettingsTest.java

@@ -214,17 +214,6 @@ public class AccessibilitySettingsTest {
         assertThat(description).isEqualTo(DEFAULT_DESCRIPTION);
     }
 
-    @Test
-    public void getServiceDescription_noDescription_showsDefaultString() {
-        doReturn(EMPTY_STRING).when(mServiceInfo).loadDescription(any());
-
-        final CharSequence description = AccessibilitySettings.getServiceDescription(mContext,
-                mServiceInfo, SERVICE_ENABLED);
-
-        assertThat(description).isEqualTo(
-                mContext.getString(R.string.accessibility_service_default_description));
-    }
-
     @Test
     public void createAccessibilityServicePreferenceList_hasOneInfo_containsSameKey() {
         final String key = DUMMY_COMPONENT_NAME.flattenToString();