am 5e21a11f: Merge change 8209 into donut

Merge commit '5e21a11f00e3e65f6d7681e2519677329f0a92b2'

* commit '5e21a11f00e3e65f6d7681e2519677329f0a92b2':
  Work around StateListDrawable padding in search suggestions