Merge "libmediaplayerservice:Fix deadlock on gapless start failure"