am d8681c9a: am 88cd369c: Merge change 25048 into eclair

Merge commit 'd8681c9a93abb1a56eae9548d568bb9ae38419a1'

* commit 'd8681c9a93abb1a56eae9548d568bb9ae38419a1':
  Revert "Deprecate showSearchIconAsBadge and icon search attrs"