Fix a crash when resuming sound setting with AfW on Ryu

Also renamed a few xmls

Change-Id: I8ff5a778a39ea45471a27048be4ea2f21075872a
Fix: 36357493
Test: make RunSettingsRoboTests

src/com/android/settings/notification/WorkSoundPreferenceController.java

@@ -222,7 +222,7 @@ public class WorkSoundPreferenceController extends PreferenceController implemen
                     KEY_WORK_ALARM_RINGTONE);
         }
         if (!mVoiceCapable) {
-            mWorkPreferenceCategory.removePreference(mWorkPhoneRingtonePreference);
+            mWorkPhoneRingtonePreference.setVisible(false);
             mWorkPhoneRingtonePreference = null;
         }