Merge "RingtoneManager: query results depend on caller permission" into mnc-dev