am 0b1a255f: Merge change 8228 into donut

Merge commit '0b1a255f736851342016e657ba6ccf096a9497ea'

* commit '0b1a255f736851342016e657ba6ccf096a9497ea':
  Remove background padding workaround from SuggestionsAdapter
diff --git a/core/java/android/app/SuggestionsAdapter.java b/core/java/android/app/SuggestionsAdapter.java
index 4cd35a4..54061ae 100644
--- a/core/java/android/app/SuggestionsAdapter.java
+++ b/core/java/android/app/SuggestionsAdapter.java
@@ -360,10 +360,6 @@
             newBg.addState(new int[]{android.R.attr.state_selected}, transparent);
             newBg.addState(new int[]{android.R.attr.state_pressed}, transparent);
             newBg.addState(new int[]{}, background);
-            // Workaround for the fact that StateListDrawable.getPadding(Rect) always returns
-            // true, and thus sets the padding of any view that has it as a background.
-            ((DrawableContainer.DrawableContainerState) newBg.getConstantState())
-                    .setVariablePadding(true);
             mBackgroundsCache.put(backgroundColor, newBg.getConstantState());
             return newBg;
         }