Merge "Revert "Move RingtoneTest to media/tests/ringtone"" into main