Merge "Fix dumpsys media.player"