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

* commit 'df4b1986f5c096a8750ecafb6f7e4a83d6ba18b7':