Merge "Revert "RingtonePlayer: URI userId must match that of caller"" into main