Merge "Migrate ringtone picking out of MediaProvider."