Merge "Fix NPE for RingtonePickerActivity in Wear" into sc-dev