Merge "[Settings] Set different ringtones at work profile"

diff --cc res/values/strings.xml
Simple merge

diff --cc src/com/android/settings/Utils.java
Simple merge

diff --cc src/com/android/settings/notification/SoundSettings.java
index a80e31d,75365cf..48b4616
--- 1/src/com/android/settings/notification/SoundSettings.java
--- 2/src/com/android/settings/notification/SoundSettings.java
+++ b/src/com/android/settings/notification/SoundSettings.java
@@@ -122,8 -148,10 +148,10 @@@ public class SoundSettings extends Sett
      private UserManager mUserManager;
      private RingtonePreference mRequestPreference;
  
+     private @UserIdInt int mManagedProfileId;
+ 
      @Override
 -    protected int getMetricsCategory() {
 +    public int getMetricsCategory() {
          return MetricsEvent.SOUND;
      }