am 5be1cdea: am 2ea36877: am 09c4eaf7: am 7f9e9012: Merge "RingtoneManager: query results depend on caller permission" into mnc-dev

* commit '5be1cdea1c3ba40edc3e85d66e86370a56726d06':
  RingtoneManager: query results depend on caller permission