am 80d3f584: Remove the calls to (un)registerAudioFocusListener that are about to be hidden. Bugs 2670395 and 2599698

Merge commit '80d3f584531e911b1fb5cce0bd3f8d974b4d0fcc' into froyo-plus-aosp

* commit '80d3f584531e911b1fb5cce0bd3f8d974b4d0fcc':
  Remove the calls to (un)registerAudioFocusListener that are about