am df7edf5d: am 55896f3c: Merge change Ib71193bf into eclair

Merge commit 'df7edf5d92ae3e708e802b68014864fe13184060' into eclair-mr2-plus-aosp

* commit 'df7edf5d92ae3e708e802b68014864fe13184060':
  Fix 2283089 - ERD47B: Force Close of Launcher2 process when hitting Search button to invoke QSB