am 628a8c0e: Merge "fix a race condition of MediaPlayerServce::Client::mClient"

* commit '628a8c0ed91531468f5c615fea8745f63cc812aa':
  fix a race condition of MediaPlayerServce::Client::mClient