am 1644f0d9: am 0a95ce9f: Merge "Handle media button events during phone calls...
am 1644f0d9: am 0a95ce9f: Merge "Handle media button events during phone calls and when ringing" into jb-dev
* commit '1644f0d9':
Handle media button events during phone calls and when ringing