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