Merge "Fix conditional log line in MediaPlayerService"