Merge change 25048 into eclair

* changes:
  Revert "Deprecate showSearchIconAsBadge and icon search attrs"