Merge "RingtoneManager: allow video ringtone URI" into udc-qpr-dev