Merge "MediaPlayer2DrmBase: apply missing changes in I02a77461904f5bb6369"