am 933a5953: am df4b1986: (-s ours) am e2788366: Merge "Fix SecurityException when trying to retrieve ringtone title" into mnc-dev

* commit '933a59537a81b136d8781a0bcc6ca56e23f9e78d':