fix deadlock in MediaPlayerService BUG: 25263909 am: 7845a1f079
am: 470b7752e3

* commit '470b7752e38307305365fdaaa005b81db977d708':
  fix deadlock in MediaPlayerService BUG: 25263909