am 8fcb312f: am c1bb46e9: am abf7fed2: Merge change I2b7c8a32 into eclair

Merge commit '8fcb312f6ca409ca46812303a405e3403fe71e9a'

* commit '8fcb312f6ca409ca46812303a405e3403fe71e9a':
  Fix more of bug 2290852: Don't wake screen when bluetooth headset is connected or disconnected.