am e95b750b: am dfe318d7: Merge "Ringtone picker is not affected by current...
am e95b750b: am dfe318d7: Merge "Ringtone picker is not affected by current sonification policy" into mnc-dev
* commit 'e95b750b':
Ringtone picker is not affected by current sonification policy