fix deadlock in MediaPlayerService BUG: 25263909
am: 7845a1f079

* commit '7845a1f0790a1de9e26e99578f6ce3219cf8efc3':
  fix deadlock in MediaPlayerService BUG: 25263909