Merge "Fix summary text on A11y SUW hub screen and remove unused String. Bug: 2696657...

diff --cc src/com/android/settings/display/ScreenZoomPreference.java
index c43622c,c3d5b65..2afc3c3
--- 1/src/com/android/settings/display/ScreenZoomPreference.java
--- 2/src/com/android/settings/display/ScreenZoomPreference.java
+++ b/src/com/android/settings/display/ScreenZoomPreference.java
@@@ -16,11 -16,11 +16,12 @@@
  
  package com.android.settings.display;
  
 +import com.android.settingslib.display.DisplayDensityUtils;
 +
  import android.content.Context;
 -import android.content.Intent;
  import android.support.v4.content.res.TypedArrayUtils;
  import android.support.v7.preference.PreferenceGroup;
+ import android.text.TextUtils;
  import android.util.AttributeSet;
  
  /**