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

* commit '7f9e9012f4bbcdd880e16212be9d90b50607c74d':
  RingtoneManager: query results depend on caller permission