Merge change 26819 into eclair

* changes:
  Fixes http://b/2143180 (mdpi sdcard notification icons).